From 2b0a91f80638314496f33df3882a4c7920af0899 Mon Sep 17 00:00:00 2001 From: oliskoli Date: Thu, 28 Jun 2007 22:27:43 +0000 Subject: [PATCH] Try to detect the truth of unknown_alt. --- csv_util.c | 4 ++++ delgpl.c | 2 ++ mapsend.c | 2 ++ 3 files changed, 8 insertions(+) diff --git a/csv_util.c b/csv_util.c index ab559378e..47b906f6a 100644 --- a/csv_util.c +++ b/csv_util.c @@ -895,10 +895,14 @@ xcsv_parse_val(const char *s, waypoint *wpt, const field_map_t *fmp) if (strcmp(fmp->key, "ALT_FEET") == 0) { /* altitude in feet as a decimal value */ wpt->altitude = FEET_TO_METERS(atof(s)); + if (wpt->altitude < unknown_alt + 1) + wpt->altitude = unknown_alt; } else if (strcmp(fmp->key, "ALT_METERS") == 0) { /* altitude in meters as a decimal value */ wpt->altitude = atof(s); + if (wpt->altitude < unknown_alt + 1) + wpt->altitude = unknown_alt; } else /* PATH CONVERSIONS ************************************************/ diff --git a/delgpl.c b/delgpl.c index dc4e3d65a..6f6e1fc2b 100644 --- a/delgpl.c +++ b/delgpl.c @@ -68,6 +68,8 @@ gpl_read(void) wpt_tmp->longitude = le_read_double(&gp.lon); alt_feet = le_read_double(&gp.alt); wpt_tmp->altitude = FEET_TO_METERS(alt_feet); + if (wpt_tmp->altitude <= unknown_alt + 1) + wpt_tmp->altitude = unknown_alt; wpt_tmp->creation_time = le_read32(&gp.tm); WAYPT_SET(wpt_tmp, course, le_read_double(&gp.heading)); diff --git a/mapsend.c b/mapsend.c index c04c9ab50..b7910bf56 100644 --- a/mapsend.c +++ b/mapsend.c @@ -205,6 +205,8 @@ mapsend_track_read(void) } else { wpt_tmp->altitude = gbfgetflt(mapsend_file_in); } + if (wpt_tmp->altitude < unknown_alt + 1) + wpt_tmp->altitude = unknown_alt; wpt_tmp->creation_time = gbfgetint32(mapsend_file_in); valid = gbfgetint32(mapsend_file_in); -- 2.30.2